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

Added anchors in the player

Browse Source
This commit is contained in:
emeric
2018-08-29 14:10:22 +02:00
parent 95f206a209
commit d51a0465cf
6 changed files with 50 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
approot/mediaplayer.xml
+4 -6
View File
@@ -2,17 +2,15 @@
<messages xmlns:if="Wt.WTemplate.conditions">
<!--FORMS message blocks-->
<message id="template-mediaplayer">
<message id="Lms.MediaPlayer.template">
<audio id="lms-mp-audio"></audio>
<div id="lms-mp-previous"><i class="fa fa-step-backward fa-2x"></i></div>
<div id="lms-mp-play"><i class="fa fa-play fa-2x"></i></div>
<div id="lms-mp-pause" style="display: none"><i class="fa fa-pause fa-2x"></i></div>
<div id="lms-mp-title">...</div>
<div id="lms-mp-artist"></div>
<div id="lms-mp-release"></div>
<div id="lms-mp-next"><i class="fa fa-step-forward fa-2x"></i></div>
${title}${artist}${release}
<div id="lms-mp-time">00:00</div>
<div id="lms-mp-duration">00:00</div>
<div id="lms-mp-previous"><i class="fa fa-step-backward fa-2x"></i></div>
<div id="lms-mp-next"><i class="fa fa-step-forward fa-2x"></i></div>
<img id="lms-mp-cover"/>
</message>
docroot/js/mediaplayer.js
+1 -7
View File
@@ -44,9 +44,6 @@ LMS.mediaplayer = function () {
_elems.pause = document.getElementById("lms-mp-pause");
_elems.previous = document.getElementById("lms-mp-previous");
_elems.next = document.getElementById("lms-mp-next");
_elems.title = document.getElementById("lms-mp-title");
_elems.artist = document.getElementById("lms-mp-artist");
_elems.release = document.getElementById("lms-mp-release");
_elems.duration = document.getElementById("lms-mp-duration");
_elems.time = document.getElementById("lms-mp-time");
_elems.cover = document.getElementById("lms-mp-cover");
@@ -79,14 +76,11 @@ LMS.mediaplayer = function () {
}
var loadTrack = function(params, autoplay) {
console.log("Loading track '" + params.name + "', release = '" + params.release + "', artist = '" + params.artist + "', resource = '" + params.resource + "', imgResource = '" + params.imgResource + "'");
console.log("Loading track, resource = '" + params.resource + "', imgResource = '" + params.imgResource + "'");
_offset = 0;
_duration = params.duration;
_elems.title.innerHTML = params.name;
_elems.artist.innerHTML = params.artist;
_elems.release.innerHTML = params.release;
_elems.audio.src = params.resource;
_elems.duration.innerHTML = _durationToString(_duration, _duration > 3600);
_elems.time.innerHTML = _durationToString(0, _duration > 3600)
src/ui/LmsApplication.cpp
+14 -2
View File
@@ -150,10 +150,16 @@ LmsApplication::finalize()
preQuit().emit();
}
Wt::WLink
LmsApplication::createArtistLink(Database::Artist::pointer artist)
{
return Wt::WLink(Wt::LinkType::InternalPath, "/artist/" + std::to_string(artist.id()));
}
std::unique_ptr<Wt::WAnchor>
LmsApplication::createArtistAnchor(Database::Artist::pointer artist, bool addText)
{
auto res = std::make_unique<Wt::WAnchor>(Wt::WLink(Wt::LinkType::InternalPath, "/artist/" + std::to_string(artist.id())));
auto res = std::make_unique<Wt::WAnchor>(createArtistLink(artist));
if (addText)
{
@@ -164,10 +170,16 @@ LmsApplication::createArtistAnchor(Database::Artist::pointer artist, bool addTex
return res;
}
Wt::WLink
LmsApplication::createReleaseLink(Database::Release::pointer release)
{
return Wt::WLink(Wt::LinkType::InternalPath, "/release/" + std::to_string(release.id()));
}
std::unique_ptr<Wt::WAnchor>
LmsApplication::createReleaseAnchor(Database::Release::pointer release, bool addText)
{
auto res = std::make_unique<Wt::WAnchor>(Wt::WLink(Wt::LinkType::InternalPath, "/release/" + std::to_string(release.id())));
auto res = std::make_unique<Wt::WAnchor>(createReleaseLink(release));
if (addText)
{
src/ui/LmsApplication.hpp
+2
View File
@@ -72,7 +72,9 @@ class LmsApplication : public Wt::WApplication
void goHomeAndQuit();
void notifyMsg(const Wt::WString& message);
static Wt::WLink createArtistLink(Database::Artist::pointer artist);
static std::unique_ptr<Wt::WAnchor> createArtistAnchor(Database::Artist::pointer artist, bool addText = true);
static Wt::WLink createReleaseLink(Database::Release::pointer release);
static std::unique_ptr<Wt::WAnchor> createReleaseAnchor(Database::Release::pointer release, bool addText = true);
static std::unique_ptr<Wt::WTemplate> createCluster(Database::Cluster::pointer cluster, bool canDelete = false);
src/ui/MediaPlayer.cpp
+24 -11
View File
@@ -19,8 +19,6 @@
#include "MediaPlayer.hpp"
#include <boost/algorithm/string/replace.hpp>
#include "av/AvInfo.hpp"
#include "utils/Logger.hpp"
@@ -35,17 +33,21 @@
namespace UserInterface {
MediaPlayer::MediaPlayer()
: Wt::WTemplate(Wt::WString::tr("template-mediaplayer")),
: Wt::WTemplate(Wt::WString::tr("Lms.MediaPlayer.template")),
playbackEnded(this, "playbackEnded"),
playPrevious(this, "playPrevious"),
playNext(this, "playNext")
{
wApp->doJavaScript("LMS.mediaplayer.init(" + jsRef() + ")");
}
_title = bindNew<Wt::WText>("title");
_title->setTextFormat(Wt::TextFormat::Plain);
static std::string escape(const std::string& str)
{
return boost::replace_all_copy(str, "\"", "\\\"");
_artist = bindNew<Wt::WAnchor>("artist");
_artist->setTextFormat(Wt::TextFormat::Plain);
_release = bindNew<Wt::WAnchor>("release");
_release->setTextFormat(Wt::TextFormat::Plain);
wApp->doJavaScript("LMS.mediaplayer.init(" + jsRef() + ")");
}
void
@@ -66,9 +68,6 @@ MediaPlayer::playTrack(Database::IdType trackId)
std::ostringstream oss;
oss
<< "var params = {"
<< " name: \"" << escape(track->getName()) + "\","
<< " release: " << (track->getRelease() ? "\"" + escape(track->getRelease()->getName()) + "\"" : "undefined" ) << ","
<< " artist: " << (track->getArtist() ? "\"" + escape(track->getArtist()->getName()) + "\"" : "undefined" ) << ","
<< " resource: \"" << resource << "\","
<< " duration: " << std::chrono::duration_cast<std::chrono::seconds>(track->getDuration()).count() << ","
<< " imgResource: \"" << imgResource << "\","
@@ -77,6 +76,20 @@ MediaPlayer::playTrack(Database::IdType trackId)
LMS_LOG(UI, DEBUG) << "Runing js = '" << oss.str() << "'";
_title->setText(Wt::WString::fromUTF8(track->getName()));
if (track->getArtist())
{
_artist->setText(Wt::WString::fromUTF8(track->getArtist()->getName()));
_artist->setLink(LmsApp->createArtistLink(track->getArtist()));
}
if (track->getRelease())
{
_release->setText(Wt::WString::fromUTF8(track->getRelease()->getName()));
_release->setLink(LmsApp->createReleaseLink(track->getRelease()));
}
wApp->doJavaScript(oss.str());
}
catch (Av::MediaFileException& e)
src/ui/MediaPlayer.hpp
+5
View File
@@ -19,8 +19,10 @@
#pragma once
#include <Wt/WAnchor.h>
#include <Wt/WJavaScript.h>
#include <Wt/WTemplate.h>
#include <Wt/WText.h>
#include "database/Types.hpp"
@@ -41,6 +43,9 @@ class MediaPlayer : public Wt::WTemplate
private:
Wt::WText* _title;
Wt::WAnchor* _release;
Wt::WAnchor* _artist;
};
} // namespace UserInterface