Added mediaplayer skeleton
This commit is contained in:
@@ -19,6 +19,7 @@ lms_images_DATA = \
|
|||||||
lms_approot_DATA = \
|
lms_approot_DATA = \
|
||||||
approot/artists.xml \
|
approot/artists.xml \
|
||||||
approot/artist.xml \
|
approot/artist.xml \
|
||||||
|
approot/mediaplayer.xml \
|
||||||
approot/messages.xml \
|
approot/messages.xml \
|
||||||
approot/releases.xml \
|
approot/releases.xml \
|
||||||
approot/release.xml \
|
approot/release.xml \
|
||||||
|
|||||||
@@ -0,0 +1,38 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
|
<messages xmlns:if="Wt.WTemplate.conditions">
|
||||||
|
<!--FORMS message blocks-->
|
||||||
|
|
||||||
|
<message id="btn-mediaplayer-prev">
|
||||||
|
<i class="fa fa-step-backward"></i>
|
||||||
|
</message>
|
||||||
|
|
||||||
|
<message id="btn-mediaplayer-play">
|
||||||
|
<i class="fa fa-play"></i>
|
||||||
|
</message>
|
||||||
|
|
||||||
|
<message id="btn-mediaplayer-pause">
|
||||||
|
<i class="fa fa-pause"></i>
|
||||||
|
</message>
|
||||||
|
|
||||||
|
<message id="btn-mediaplayer-next">
|
||||||
|
<i class="fa fa-step-forward"></i>
|
||||||
|
</message>
|
||||||
|
|
||||||
|
<message id="btn-mediaplayer-shuffle">
|
||||||
|
<i class="fa fa-random"></i>
|
||||||
|
</message>
|
||||||
|
|
||||||
|
<message id="btn-mediaplayer-repeat">
|
||||||
|
<i class="fa fa-repeat"></i>
|
||||||
|
</message>
|
||||||
|
|
||||||
|
<message id="template-mediaplayer">
|
||||||
|
${previous} ${play-pause} ${next}
|
||||||
|
${next} ${cover}
|
||||||
|
${current-time} ${total-time} ${shuffle} ${repeat}
|
||||||
|
${<if-has-artist>}${artist-name}${</if-has-artist>}
|
||||||
|
${<if-has-release>}${release-name}${</if-has-release>}
|
||||||
|
${track-name}
|
||||||
|
</message>
|
||||||
|
|
||||||
|
</messages>
|
||||||
@@ -5,6 +5,7 @@
|
|||||||
<message id="template-main">
|
<message id="template-main">
|
||||||
${navbar-top class="main-nav"}
|
${navbar-top class="main-nav"}
|
||||||
${contents class="container"}
|
${contents class="container"}
|
||||||
|
${player}
|
||||||
</message>
|
</message>
|
||||||
|
|
||||||
<message id="template-home">
|
<message id="template-home">
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ lms_SOURCES = \
|
|||||||
$(srcdir)/ui/Filters.cpp \
|
$(srcdir)/ui/Filters.cpp \
|
||||||
$(srcdir)/ui/HomeView.cpp \
|
$(srcdir)/ui/HomeView.cpp \
|
||||||
$(srcdir)/ui/LmsApplication.cpp \
|
$(srcdir)/ui/LmsApplication.cpp \
|
||||||
|
$(srcdir)/ui/MediaPlayer.cpp \
|
||||||
$(srcdir)/ui/ReleasesView.cpp \
|
$(srcdir)/ui/ReleasesView.cpp \
|
||||||
$(srcdir)/ui/ReleaseView.cpp \
|
$(srcdir)/ui/ReleaseView.cpp \
|
||||||
$(srcdir)/ui/TracksView.cpp \
|
$(srcdir)/ui/TracksView.cpp \
|
||||||
|
|||||||
@@ -31,7 +31,7 @@
|
|||||||
#include "auth/LmsAuth.hpp"
|
#include "auth/LmsAuth.hpp"
|
||||||
#include "Explore.hpp"
|
#include "Explore.hpp"
|
||||||
#include "HomeView.hpp"
|
#include "HomeView.hpp"
|
||||||
|
#include "MediaPlayer.hpp"
|
||||||
|
|
||||||
#include "LmsApplication.hpp"
|
#include "LmsApplication.hpp"
|
||||||
|
|
||||||
@@ -81,6 +81,7 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti
|
|||||||
messageResourceBundle().use(appRoot() + "artist");
|
messageResourceBundle().use(appRoot() + "artist");
|
||||||
messageResourceBundle().use(appRoot() + "artists");
|
messageResourceBundle().use(appRoot() + "artists");
|
||||||
messageResourceBundle().use(appRoot() + "messages");
|
messageResourceBundle().use(appRoot() + "messages");
|
||||||
|
messageResourceBundle().use(appRoot() + "mediaplayer");
|
||||||
messageResourceBundle().use(appRoot() + "templates");
|
messageResourceBundle().use(appRoot() + "templates");
|
||||||
messageResourceBundle().use(appRoot() + "release");
|
messageResourceBundle().use(appRoot() + "release");
|
||||||
messageResourceBundle().use(appRoot() + "releases");
|
messageResourceBundle().use(appRoot() + "releases");
|
||||||
@@ -270,8 +271,8 @@ LmsApplication::handleAuthEvent(void)
|
|||||||
mainStack->addWidget(new Wt::WText("SETTINGS"));
|
mainStack->addWidget(new Wt::WText("SETTINGS"));
|
||||||
|
|
||||||
// MediaPlayer
|
// MediaPlayer
|
||||||
// auto player = new AudioPlayer(AudioPlayer::ControlPlayqueue);
|
auto player = new MediaPlayer();
|
||||||
// main->bindWidget("player", player);
|
main->bindWidget("player", player);
|
||||||
|
|
||||||
internalPathChanged().connect(std::bind([=]
|
internalPathChanged().connect(std::bind([=]
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user