From c09acbc65d5d0ea162bf03b2d788c38b7526245d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Cocula?= Date: Mon, 11 Sep 2017 20:52:05 +0200 Subject: [PATCH] Introduction of a new kind of jukebox player based on the javasound api. --- airsonic-main/pom.xml | 21 +- .../player/ajax/PlayQueueService.java | 183 ++++--- .../player/command/PlayerSettingsCommand.java | 18 + .../controller/PlayQueueController.java | 12 - .../controller/PlayerSettingsController.java | 6 + .../controller/SubsonicRESTController.java | 94 ++-- .../org/airsonic/player/dao/PlayerDao.java | 19 +- .../org/airsonic/player/domain/Player.java | 18 +- .../player/domain/PlayerTechnology.java | 7 +- .../player/service/JukeboxJavaService.java | 356 ++++++++++++ .../service/JukeboxLegacySubsonicService.java | 210 ++++++++ .../player/service/JukeboxService.java | 244 ++++----- .../player/service/PlayerService.java | 6 +- .../liquibase/6.3/add-player-mixer.xml | 17 + .../resources/liquibase/6.3/changelog.xml | 1 + .../player/i18n/ResourceBundle_en.properties | 3 + .../jsp/javaJukeboxPlayerControlBar.jspf | 35 ++ .../src/main/webapp/WEB-INF/jsp/playQueue.jsp | 221 ++++---- .../webapp/WEB-INF/jsp/playerSettings.jsp | 136 +++-- .../main/webapp/script/moment-2.18.1.min.js | 7 + .../script/moment-with-locales-2.18.1.min.js | 505 ++++++++++++++++++ .../playQueue/javaJukeboxPlayerControlBar.js | 102 ++++ .../default-without-mediaelement-light.css | 16 + 23 files changed, 1825 insertions(+), 412 deletions(-) create mode 100644 airsonic-main/src/main/java/org/airsonic/player/service/JukeboxJavaService.java create mode 100644 airsonic-main/src/main/java/org/airsonic/player/service/JukeboxLegacySubsonicService.java create mode 100644 airsonic-main/src/main/resources/liquibase/6.3/add-player-mixer.xml create mode 100644 airsonic-main/src/main/webapp/WEB-INF/jsp/javaJukeboxPlayerControlBar.jspf create mode 100644 airsonic-main/src/main/webapp/script/moment-2.18.1.min.js create mode 100644 airsonic-main/src/main/webapp/script/moment-with-locales-2.18.1.min.js create mode 100644 airsonic-main/src/main/webapp/script/playQueue/javaJukeboxPlayerControlBar.js diff --git a/airsonic-main/pom.xml b/airsonic-main/pom.xml index 3ff76728..a40c91f6 100644 --- a/airsonic-main/pom.xml +++ b/airsonic-main/pom.xml @@ -31,6 +31,25 @@ ${project.version} + + + com.github.biconou + AudioPlayer + 0.2.3 + + + org.slf4j + slf4j-simple + + + commons-io + commons-io + + + + +