From 145244102b9319e2369d65c54536cf44aa990f96 Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 24 Mar 2018 15:17:34 +0100 Subject: [PATCH] Adding mediaplayer.js skeleton --- Makefile.am | 10 +++++++--- conf/lms.conf | 2 +- docroot/js/mediaplayer.js | 1 + src/ui/LmsApplication.cpp | 2 ++ 4 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 docroot/js/mediaplayer.js diff --git a/Makefile.am b/Makefile.am index 0c4a11d0..ded64f2e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,13 +8,17 @@ lms_approotdir=$(pkgdatadir)/approot lms_cssdir=$(lms_docrootdir)/css lms_imagesdir=$(lms_docrootdir)/images +lms_jsdir=$(lms_docrootdir)/js lms_css_DATA = \ - docroot/css/lms.css + docroot/css/lms.css lms_images_DATA = \ - docroot/images/unknown-cover.jpg \ - docroot/images/unknown-artist.jpg + docroot/images/unknown-cover.jpg \ + docroot/images/unknown-artist.jpg + +lms_js_DATA = \ + docroot/js/mediaplayer.js lms_approot_DATA = \ approot/admin-database.xml \ diff --git a/conf/lms.conf b/conf/lms.conf index e457c84a..722d25c3 100644 --- a/conf/lms.conf +++ b/conf/lms.conf @@ -16,7 +16,7 @@ tls-key = "/var/lms/privkey.pem"; tls-dh = "/var/lms/dh2048.pem"; # Path to the resources used by the web interface -docroot = "/usr/share/lms/docroot/;/resources,/css,/images,/favicon.ico"; +docroot = "/usr/share/lms/docroot/;/resources,/css,/images,/js,/favicon.ico"; approot = "/usr/share/lms/approot"; diff --git a/docroot/js/mediaplayer.js b/docroot/js/mediaplayer.js new file mode 100644 index 00000000..8a2ab650 --- /dev/null +++ b/docroot/js/mediaplayer.js @@ -0,0 +1 @@ +/* TEST */ diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index 5b28bcee..f5985f6d 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -237,6 +237,8 @@ LmsApplication::handleAuthEvent(void) LMS_LOG(UI, INFO) << "User '" << CurrentAuthUser().identity(Wt::Auth::Identity::LoginName) << "' logged in from '" << Wt::WApplication::instance()->environment().clientAddress() << "', user agent = " << Wt::WApplication::instance()->environment().agent() << ", session = " << Wt::WApplication::instance()->sessionId(); + require("/js/mediaplayer.js"); + _imageResource = new ImageResource(_db, root()); _transcodeResource = new TranscodeResource(_db, root());